diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 0f3a1ea..5a55002 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -98,7 +98,7 @@
 	{
 		// If an existing DB connection resource is supplied
 		// there is no need to connect and select the database
-		if (is_resource($this->conn_id))
+		if (is_resource($this->conn_id) OR is_object($this->conn_id))
 		{
 			return TRUE;
 		}
@@ -1097,7 +1097,7 @@
 	 */	
 	function close()
 	{
-		if (is_resource($this->conn_id))
+		if (is_resource($this->conn_id) OR is_object($this->conn_id))
 		{
 			$this->_close($this->conn_id);
 		}
diff --git a/system/database/drivers/mysqli/mysqli_result.php b/system/database/drivers/mysqli/mysqli_result.php
index 586c292..692d4f7 100644
--- a/system/database/drivers/mysqli/mysqli_result.php
+++ b/system/database/drivers/mysqli/mysqli_result.php
@@ -114,7 +114,7 @@
 	 */		
 	function free_result()
 	{
-		if (is_resource($this->result_id))
+		if (is_object($this->result_id))
 		{
 			mysqli_free_result($this->result_id);
 			$this->result_id = FALSE;